Skip to content

optimize packaging #1225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
BLumia merged 8 commits into from
Aug 21, 2025
Merged

optimize packaging #1225

BLumia merged 8 commits into from
Aug 21, 2025

Conversation

@UTsweetyfish
Copy link
Member

@UTsweetyfish UTsweetyfish commented Aug 21, 2025 •
edited by sourcery-ai bot
Loading

  • Declare Breaks against dde-clipboard (<< 1:6.0.14)
  • dde-shell should not be Multi-Arch: same
  • d/control: Update B-D relationship from > to >=
  • Update debhelper-compat to 13, Standards-Version to 4.6.2
  • wrap-and-sort -bastk
  • Sort debian/dde-shell.install
  • fix d/changelog
  • Drop ENABLE_DEEPIN_NMQT, no longer rely on lsb_release

Summary by Sourcery

Optimize Debian packaging by updating compatibility and standards versions, refining dependency declarations, sorting install files, and removing obsolete options

Build:

  • Bump debhelper-compat to 13 and update Standards-Version to 4.6.2
  • Change Build-Depends relationships from '>' to '>='
  • Declare Breaks against dde-clipboard (<< 1:6.0.14)
  • Remove 'Multi-Arch: same' from dde-shell
  • Drop ENABLE_DEEPIN_NMQT option and eliminate lsb_release reliance
  • Sort entries in debian/*.install files and apply wrap-and-sort to rules
  • Fix formatting in debian/changelog

@UTsweetyfish
Declare Breaks against dde-clipboard (<< 1:6.0.14)
ee393d8 
dde-shell 1.99.3 dropped dock-clipboarditem
dde-clipboard 6.0.14 added dock-clipboard-plugin

linuxdeepin@c3e7601
linuxdeepin/dde-clipboard@8f21399

Reorg: dde-shell and dde-clipboard existed; move some files from dde-shell to dde-clipboard
@UTsweetyfish
dde-shell should not be Multi-Arch: same
50f42e3
@UTsweetyfish
d/control: Update B-D relationship from > to >=
12ea8c4 
(The short version restrictions < and > actually mean <= and >= (and not << or >>, as one might expect).
@UTsweetyfish
Update debhelper-compat to 13, Standards-Version to 4.6.2
af0eb10
@UTsweetyfish
wrap-and-sort -bastk
2f81ea1
@UTsweetyfish
Sort debian/dde-shell.install
79088f3
@UTsweetyfish
fix d/changelog
3724cc8
@UTsweetyfish
Drop ENABLE_DEEPIN_NMQT, no longer rely on lsb_release
d9dc856
@github-actions
Copy link

github-actions bot commented Aug 21, 2025

TAG Bot

TAG: 2.0.6
EXISTED: yes
DISTRIBUTION: unstable

@UTsweetyfish UTsweetyfish requested a review from BLumia August 21, 2025 08:25
@sourcery-ai
Copy link

sourcery-ai bot commented Aug 21, 2025

Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

This PR refines the Debian packaging by tightening dependency constraints, bumping Debhelper compatibility and Standards-Version, cleaning up install lists and rules, and removing obsolete configuration flags.

File-Level Changes

Change Details Files
Updated package dependency constraints and packaging metadata
  • Declare Breaks against dde-clipboard << 1:6.0.14
  • Change Build-Depends operator from > to >=
  • Bump debhelper-compat to 13 and Standards-Version to 4.6.2
 debian/control
debian/changelog
Removed Multi-Arch declaration for dde-shell
  • Drop Multi-Arch: same entry for dde-shell
 debian/control
Sorted and wrapped install lists for consistency
  • Run wrap-and-sort on rules
  • Sort entries in dde-shell.install
  • Sort entries in libdde-shell-dev.install
 debian/rules
debian/dde-shell.install
debian/libdde-shell-dev.install
Removed obsolete build options
  • Drop ENABLE_DEEPIN_NMQT flag
  • Remove reliance on lsb_release in rules
 debian/rules
Fixed changelog formatting
  • Correct debian/changelog entry formatting
 debian/changelog
Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

sourcery-ai[bot]
sourcery-ai bot reviewed Aug 21, 2025
View reviewed changes
Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey there - I've reviewed your changes and they look great!

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@deepin-ci-robot
Copy link

deepin-ci-robot commented Aug 21, 2025

deepin pr auto review

这是一个 Debian 包的变更集，主要涉及 dde-shell 包的更新。我来分析一下这个变更集并提出改进建议：

  1. changelog 文件改进：
  • 拼写错误修正：如 "tanslation" 改为 "translation"，"copywriting" 改为 "copywriting"
  • 格式统一：将作者行从单破折号 "--" 改为双破折号 " -- "
  • 日期格式统一：确保所有日期格式一致
  • 建议在 changelog 中添加更详细的变更说明，而不仅仅是简单的修复和功能添加
  1. control 文件改进：
  • Build-Depends 依赖项重新组织并增加了新的依赖项
  • Standards-Version 从 3.9.8 更新到 4.6.2，这是一个好的更新
  • 包依赖关系重新组织，提高了可读性
  • 建议添加依赖项的版本限制说明，特别是对于关键依赖项
  • libdde-shell-dev 包被移到文件末尾，建议保持与包定义一致的组织结构
  1. install 文件改进：
  • 文件路径重新组织，提高了可读性
  • 添加了新的安装文件路径
  • 建议对安装文件进行分类，比如按类型（库、配置、资源等）分组
  1. libdde-shell-dev.install 文件改进：
  • 将库文件路径移到了头文件路径之后，这可能会导致开发包安装顺序问题
  • 建议保持逻辑顺序：先头文件，然后是库文件，最后是 cmake 文件
  1. rules 文件改进：
  • 移除了 DISTRO 相关的条件编译逻辑
  • 简化了构建配置
  • 建议添加构建错误处理机制

总体建议：

  1. 添加自动化测试来确保包的正确性
  2. 考虑添加构建时的依赖检查
  3. 对于复杂的依赖关系，建议添加注释说明
  4. 考虑添加包的构建和安装文档
  5. 建议对变更进行更详细的记录，特别是在 changelog 中
  6. 考虑添加构建时的安全检查
  7. 对于关键的依赖项，建议添加最小版本要求

这些改进可以提高包的质量、可维护性和安全性。

@deepin-ci-robot
Copy link

deepin-ci-robot commented Aug 21, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: BLumia, UTsweetyfish

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@BLumia BLumia merged commit 4966741 into linuxdeepin:master Aug 21, 2025
8 of 11 checks passed
@deepin-ci-robot deepin-ci-robot mentioned this pull request Aug 22, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sourcery-ai sourcery-ai[bot] sourcery-ai[bot] left review comments

@BLumia BLumia BLumia approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@UTsweetyfish @deepin-ci-robot @BLumia